Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libgit2: 1.8.4 -> 1.9.0 (also pygit2 update) #373096

Merged
merged 14 commits into from
Jan 27, 2025
Merged

libgit2: 1.8.4 -> 1.9.0 (also pygit2 update) #373096

merged 14 commits into from
Jan 27, 2025
+448 −1,277

Conversation

rhelmot
Copy link
Contributor

@rhelmot rhelmot commented Jan 12, 2025 •
edited
Loading

Also includes a small configuration diff to get it to build on OpenBSD. I'll run nixpkgs-review overnight.

Changelog

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-openbsd (cross)
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@mrcjkb mrcjkb mentioned this pull request Jan 12, 2025
Open
@rhelmot
Copy link
Contributor Author

rhelmot commented Jan 17, 2025

nixpkgs-review is still running... there are 11 failures so far, most of which are projects that have libgit2 pinned to < 1.9.0... which is obviously concerning.

@rhelmot
Copy link
Contributor Author

rhelmot commented Jan 17, 2025

libgit2 seems to have introduced breaking changes this version, so this is gonna be a nasty upgrade...

@rhelmot

This comment was marked as outdated.

Sign in to view
@emilazy emilazy mentioned this pull request Jan 21, 2025
Open
4 tasks
@emilazy
Copy link
Member

emilazy commented Jan 21, 2025

Pushed to:

  • rebase on the merge base of staging and master for easier testing;
  • fix the build on Darwin when using a case‐sensitive build directory;
  • fix Nix and Jujutsu.

Will try another review with these fixes; hopefully it’ll be considerably more green.

Mic92
Mic92 approved these changes Jan 21, 2025
View reviewed changes
Copy link
Member

@Mic92 Mic92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nix side looks good to me.

@rhelmot

This comment has been minimized.

Sign in to view
@emilazy
Copy link
Member

emilazy commented Jan 22, 2025

nixStatic is already broken on master, because pkgsStatic.git is. This PR isn’t regressing it, so no worries there.

We were already patching libgit2-glib for 1.8.0; I’ve added a patch for 1.9.0 that is already used by Homebrew. That should fix a handful of the failures.

cargo-update was fixed with a bump. It looks like GitButler would be fixed with an update too but there‘s some cursed Cargo fetcher thing that makes that not just a matter of nix-update.

cargo-generate and nix-init look like they just need Cargo patches to bump their indirect git2 dependencies. Hopefully nix-init can be fixed upstream as with the last libgit2 bump.

Nothing else really looks concerning, assuming that the libgit2-glib patch fixes its downstream users. Probably a good time for another nixpkgs-review run.

@rhelmot

This comment was marked as outdated.

Sign in to view
@emilazy
Copy link
Member

emilazy commented Jan 22, 2025

The actual regressions vs. master (other than GitButler) are:

✔  cargo-generate-0.22.1  2025-01-19  https://hydra.nixos.org/build/285731652
✔  edopro-application-40.1.4  2025-01-19  https://hydra.nixos.org/build/285667490
✔  gex-0.6.4  2025-01-20  https://hydra.nixos.org/build/285808304
✔  git-mit-5.14.3  2025-01-19  https://hydra.nixos.org/build/285787901
✔  git-warp-time-0.8.4  2025-01-19  https://hydra.nixos.org/build/285745844
✔  guile-git-0.9.0  2025-01-20  https://hydra.nixos.org/build/285782126
✔  guix-1.4.0  2025-01-20  https://hydra.nixos.org/build/285738832
✔  nix-init-0.3.2  2025-01-19  https://hydra.nixos.org/build/285739351
✔  poac-0.10.1  2025-01-19  https://hydra.nixos.org/build/285681930
✔  snapcraft-8.5.1  2025-01-22  https://hydra.nixos.org/build/286309123

I’ll try to take a look at these tonight.

@rhelmot
Copy link
Contributor Author

rhelmot commented Jan 22, 2025

edo9300/edopro#284 legitimate failure from upstream with no patch available for edopro-application.

@emilazy emilazy mentioned this pull request Jan 22, 2025
Open
@emilazy
Copy link
Member

emilazy commented Jan 23, 2025

snapcraft was apparently a transient failure. I believe the only remaining regressions are nix-init (waiting on nix-community/nix-init#589) and gitbutler (waiting on #282798), so this should be as ready as it’ll ever be. Upstreaming the guile-git changes is pending figuring out what happened to my GitLab account…

@rhelmot
Copy link
Contributor Author

rhelmot commented Jan 23, 2025 •
edited
Loading

also poac, which was renamed to cabinpkg on master, should be fixed with #376011

@mweinelt mweinelt mentioned this pull request Jan 24, 2025
Open
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 25, 2025
rhelmot and others added 14 commits January 24, 2025 20:18
@rhelmot
libgit2: 1.8.4 -> 1.9.0
9ac2350
@rhelmot
python3Packages.pygit2: 1.16.0 -> 1.17.0
396775b
@emilazy @rhelmot
libgit2-glib: add patch for libgit2 1.9.0
dbb5895
@emilazy @rhelmot
libgit2: add upstream patch for case‐sensitive build directories
8d1b72d
@emilazy @rhelmot
nixVersions.{nix_2_25,git}: remove obsolete libgit2 patches
5a47d95
@emilazy @rhelmot
jujutsu: add patch for libgit2 1.9.0
a6ef617
@emilazy @rhelmot
cargo-update: 16.0.0 -> 16.1.0
3a051e3 
Diff: https://diff.rs/cargo-update/16.0.0/16.1.0

Changelog: https://github.com/nabijaczleweli/cargo-update/releases/tag/v16.1.0
@rhelmot
gex: bump version of libgit2
6b2fda7
@rhelmot
cargo-generate: add upstream patch to bump libgit2 version
e57355e
@rhelmot
git-mit: add upstream patch for libgit2 version bump
9ef4c28
@rhelmot
edopro: add patch from upstream to fix libgit2 version bump
c868f57
@emilazy @rhelmot
git-warp-time: 0.8.4 -> 0.8.5
97975c2 
Diff: alerque/git-warp-time@None...v0.8.5

Changelog: https://github.com/alerque/git-warp-time/raw/v0.8.5/CHANGELOG.md
@emilazy @rhelmot
guile-git: add patches for libgit2 1.9.0
a6e9cf8
@emilazy @rhelmot
guile-git: enable tests on Darwin
a50178f
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 25, 2025
@rhelmot
Copy link
Contributor Author

rhelmot commented Jan 25, 2025

rebased on top of staging to resolve conflicts with #376038 and friends. running review now. I'm going to suggest that we've done enough work to mitigate fallout from this upgrade and we should merge.

@emilazy
Copy link
Member

emilazy commented Jan 25, 2025

Agreed, doesn’t seem like a nix-init update is going to happen before this is merged.

Did you regenerate the changed cargoHashes after rebase (since useFetchCargoVendor uses a different scheme)? Sadly a review won’t catch that if you have the previous FODs cached…

emilazy
emilazy approved these changes Jan 27, 2025
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed hashes were regenerated, merging!

@emilazy emilazy merged commit 23ebd08 into NixOS:staging Jan 27, 2025
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@emilazy emilazy emilazy approved these changes

@Mic92 Mic92 Mic92 approved these changes

@tomberek tomberek Awaiting requested review from tomberek

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@edolstra edolstra Awaiting requested review from edolstra

@roberth roberth Awaiting requested review from roberth

@fricklerhandwerk fricklerhandwerk Awaiting requested review from fricklerhandwerk

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@bbigras bbigras Awaiting requested review from bbigras

@0x4A6F 0x4A6F Awaiting requested review from 0x4A6F

@Artturin Artturin Awaiting requested review from Artturin

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rhelmot @emilazy @Mic92 @SuperSandro2000